|
|
@@ -11,7 +11,6 @@ import android.text.TextUtils;
|
11
|
11
|
|
12
|
12
|
import com.android.common.executors.ThreadExecutor;
|
13
|
13
|
import com.android.common.utils.LogHelper;
|
14
|
|
-import com.android.common.utils.NetworkUtil;
|
15
|
14
|
|
16
|
15
|
import org.json.JSONArray;
|
17
|
16
|
import org.json.JSONObject;
|
|
|
@@ -41,6 +40,8 @@ public class OrderDealService extends Service implements Handler.Callback{
|
41
|
40
|
|
42
|
41
|
private static final int MSG_QUERY_ORDER = 2001;
|
43
|
42
|
|
|
43
|
+ private static final String TAG = "OrderDealService";
|
|
44
|
+
|
44
|
45
|
@Override
|
45
|
46
|
public void onCreate() {
|
46
|
47
|
super.onCreate();
|
|
|
@@ -68,7 +69,7 @@ public class OrderDealService extends Service implements Handler.Callback{
|
68
|
69
|
|
69
|
70
|
@Override
|
70
|
71
|
protected boolean parseResponse(String response) {
|
71
|
|
- LogHelper.d("OrderDealService", "startQuery order list = " + response);
|
|
72
|
+ LogHelper.d(TAG, "startQuery 查询是否有新订单 = " + response);
|
72
|
73
|
try {
|
73
|
74
|
JSONObject json = new JSONObject(response);
|
74
|
75
|
int status = json.getInt("status");
|
|
|
@@ -104,8 +105,10 @@ public class OrderDealService extends Service implements Handler.Callback{
|
104
|
105
|
if(listener!= null) {
|
105
|
106
|
if (orderList != null && orderList.size() > 0) {
|
106
|
107
|
listener.onOrderArrived();
|
|
108
|
+ LogHelper.d(TAG,"有新的订单");
|
107
|
109
|
}else{
|
108
|
110
|
listener.onOrderCompleted();
|
|
111
|
+ LogHelper.d(TAG,"当前没有新订单");
|
109
|
112
|
}
|
110
|
113
|
}
|
111
|
114
|
dealOrder();
|
|
|
@@ -114,6 +117,7 @@ public class OrderDealService extends Service implements Handler.Callback{
|
114
|
117
|
@Override
|
115
|
118
|
protected void onPostFail() {
|
116
|
119
|
super.onPostFail();
|
|
120
|
+ LogHelper.d(TAG,"查询新订单失败");
|
117
|
121
|
dealOrder();
|
118
|
122
|
}
|
119
|
123
|
}.executeOnExecutor(ThreadExecutor.getInstance().getExecutor(), UrlContainer.QUERY_ORIGIN_ORDER_URL);
|
|
|
@@ -123,15 +127,17 @@ public class OrderDealService extends Service implements Handler.Callback{
|
123
|
127
|
private void dealOrder() {
|
124
|
128
|
if (!isQueueEmpty()) {
|
125
|
129
|
OrderBean orderBean = orderList.get(0);
|
|
130
|
+ LogHelper.d(TAG,"当前有未处理的订单" +orderBean);
|
126
|
131
|
fetchOriginFromBox(orderBean);
|
127
|
132
|
} else {
|
|
133
|
+ LogHelper.d(TAG,"当前没有订单,10s后再次查询");
|
128
|
134
|
handler.removeMessages(MSG_QUERY_ORDER);
|
129
|
135
|
handler.sendEmptyMessageDelayed(MSG_QUERY_ORDER,10000);
|
130
|
136
|
}
|
131
|
137
|
}
|
132
|
138
|
|
133
|
139
|
private void fetchOriginFromBox(final OrderBean orderBean) {
|
134
|
|
- LogHelper.d("OrderDealService", "fetchOriginFromBox ");
|
|
140
|
+ LogHelper.d(TAG, "fetchOriginFromBox 从box中获取原图 "+orderBean);
|
135
|
141
|
HashMap<String, String> params = new HashMap<>();
|
136
|
142
|
params.put("lensman", Preferences.getInstance().getLensManId());
|
137
|
143
|
params.put("session", orderBean.sessionId);
|
|
|
@@ -156,7 +162,7 @@ public class OrderDealService extends Service implements Handler.Callback{
|
156
|
162
|
|
157
|
163
|
@Override
|
158
|
164
|
protected boolean parseResponse(String response) {
|
159
|
|
- LogHelper.d("OrderDealService", "fetchOriginFromBox get response string = " + response);
|
|
165
|
+ LogHelper.d(TAG, "fetchOriginFromBox get response string = " + response);
|
160
|
166
|
try {
|
161
|
167
|
JSONObject json = new JSONObject(response);
|
162
|
168
|
int status = json.getInt("status");
|
|
|
@@ -183,6 +189,7 @@ public class OrderDealService extends Service implements Handler.Callback{
|
183
|
189
|
@Override
|
184
|
190
|
protected void onPostFail() {
|
185
|
191
|
super.onPostFail();
|
|
192
|
+ LogHelper.d(TAG,"fetchOriginFromBox onPostFail 获取原图失败");
|
186
|
193
|
orderList.remove(orderBean);
|
187
|
194
|
dealOrder();
|
188
|
195
|
}
|
|
|
@@ -191,8 +198,10 @@ public class OrderDealService extends Service implements Handler.Callback{
|
191
|
198
|
protected void onPostSuccess() {
|
192
|
199
|
super.onPostSuccess();
|
193
|
200
|
if(TextUtils.isEmpty(orderBean.photoBean.photoPath)){
|
|
201
|
+ LogHelper.d(TAG,"fetchOriginFromBox onPostSuccess 获取原图失败,因为原图已被删除");
|
194
|
202
|
reportOriginPhotoDeleted(orderBean);
|
195
|
203
|
}else{
|
|
204
|
+ LogHelper.d(TAG,"fetchOriginFromBox onPostSuccess 获取原图地址成功,准备保存");
|
196
|
205
|
new SavePhotoTask(orderBean).executeOnExecutor(ThreadExecutor.getInstance().getExecutor(), orderBean);
|
197
|
206
|
}
|
198
|
207
|
}
|
|
|
@@ -240,7 +249,7 @@ public class OrderDealService extends Service implements Handler.Callback{
|
240
|
249
|
if(BuildConfig.isTestMode){
|
241
|
250
|
path = "http://img.pconline.com.cn/images/upload/upc/tx/wallpaper/1402/12/c1/31189058_1392186616852.jpg";
|
242
|
251
|
}
|
243
|
|
- LogHelper.d("OrderDealService", "保存照片到本地,图片链接地址为" + path);
|
|
252
|
+ LogHelper.d(TAG, "SavePhotoTask 保存照片到本地,图片链接地址为" + path);
|
244
|
253
|
FileOutputStream fOut = null;
|
245
|
254
|
HttpURLConnection conn = null;
|
246
|
255
|
InputStream inStream = null;
|
|
|
@@ -263,7 +272,7 @@ public class OrderDealService extends Service implements Handler.Callback{
|
263
|
272
|
fOut.flush();
|
264
|
273
|
}
|
265
|
274
|
fOut.flush();
|
266
|
|
- LogHelper.d("OrderDealService", "保存照片到本地,图片保存至" + file.getAbsolutePath() + "图片大小为" + file.length() + "字节\n\n");
|
|
275
|
+ LogHelper.d(TAG, "SavePhotoTask 保存照片到本地,图片保存至" + file.getAbsolutePath() + "图片大小为" + file.length() + "字节\n\n");
|
267
|
276
|
}
|
268
|
277
|
return true;
|
269
|
278
|
} catch (Exception e) {
|
|
|
@@ -284,8 +293,10 @@ public class OrderDealService extends Service implements Handler.Callback{
|
284
|
293
|
protected void onPostExecute(Boolean result) {
|
285
|
294
|
super.onPostExecute(result);
|
286
|
295
|
if (result) {
|
|
296
|
+ LogHelper.d(TAG,"savePhotoTask onPostExecute success 保存本地成功,准备上传");
|
287
|
297
|
uploadOrigin(orderBean);
|
288
|
298
|
} else {
|
|
299
|
+ LogHelper.d(TAG,"savePhotoTask onPostExecute fail 保存本地失败,下次重试");
|
289
|
300
|
orderList.remove(orderBean);
|
290
|
301
|
dealOrder();
|
291
|
302
|
}
|
|
|
@@ -301,7 +312,7 @@ public class OrderDealService extends Service implements Handler.Callback{
|
301
|
312
|
|
302
|
313
|
@Override
|
303
|
314
|
protected boolean parseResponse(String response) {
|
304
|
|
- LogHelper.d("OrderDealService", "reportOriginPhotoDeleted get response string = " + response);
|
|
315
|
+ LogHelper.d(TAG, "reportOriginPhotoDeleted get response string = " + response);
|
305
|
316
|
try {
|
306
|
317
|
JSONObject json = new JSONObject(response);
|
307
|
318
|
int status = json.getInt("status");
|
|
|
@@ -329,6 +340,7 @@ public class OrderDealService extends Service implements Handler.Callback{
|
329
|
340
|
}
|
330
|
341
|
}.executeOnExecutor(ThreadExecutor.getInstance().getExecutor(), UrlContainer.ORIGIN_PHOTO_UPLOAD_URL);
|
331
|
342
|
|
|
343
|
+ LogHelper.d(TAG,"reportOriginPhotoDeleted task executes 上报服务器原图已删除");
|
332
|
344
|
}
|
333
|
345
|
public class UploadTask extends AsyncTask<Void, Integer, Boolean> {
|
334
|
346
|
|
|
|
@@ -340,14 +352,14 @@ public class OrderDealService extends Service implements Handler.Callback{
|
340
|
352
|
|
341
|
353
|
@Override
|
342
|
354
|
protected Boolean doInBackground(Void... params) {
|
343
|
|
- for (int k = 0; k < 5; k++) {
|
|
355
|
+ for (int k = 0; k < 3; k++) {
|
344
|
356
|
try {
|
345
|
357
|
String dirPath = ai.pai.lensman.utils.Constants.APP_IMAGE_DIR + File.separator + bean.sessionId
|
346
|
358
|
+ File.separator + Constants.ORIGIN_DIR_NAME;
|
347
|
359
|
File dir = new File(dirPath);
|
348
|
360
|
dir.mkdirs();
|
349
|
361
|
File photo = new File(dir, bean.photoBean.photoName);
|
350
|
|
- LogHelper.d("OrderDealService", "上传照片 第" + k + "次尝试" + bean);
|
|
362
|
+ LogHelper.d(TAG, "上传照片 第" + k + "次尝试" + bean);
|
351
|
363
|
if (photo.exists() && photo.isFile()) {
|
352
|
364
|
PhotoUploadUtils photoUploadUtils = new PhotoUploadUtils(UrlContainer.ORIGIN_PHOTO_UPLOAD_URL + "?timestamp=" + System.currentTimeMillis());
|
353
|
365
|
photoUploadUtils.addTextParameter("deleted", String.valueOf(0));
|
|
|
@@ -360,7 +372,7 @@ public class OrderDealService extends Service implements Handler.Callback{
|
360
|
372
|
String result = new String(photoUploadUtils.send(false), "UTF-8");
|
361
|
373
|
JSONObject resultObj = new JSONObject(result);
|
362
|
374
|
if (resultObj.getInt("status") == 200) {
|
363
|
|
- LogHelper.d("OrderDealService", "上传 UploadTask upload result ok ");
|
|
375
|
+ LogHelper.d(TAG, "上传 UploadTask upload result ok ");
|
364
|
376
|
return true;
|
365
|
377
|
}
|
366
|
378
|
} else {
|
|
|
@@ -368,7 +380,7 @@ public class OrderDealService extends Service implements Handler.Callback{
|
368
|
380
|
}
|
369
|
381
|
|
370
|
382
|
} catch (Exception e) {
|
371
|
|
- LogHelper.d("OrderDealService", "上传发生异常 UploadTask :" + bean + " error:" + e);
|
|
383
|
+ LogHelper.d(TAG, "上传发生异常 UploadTask :" + bean + " error:" + e);
|
372
|
384
|
}
|
373
|
385
|
}
|
374
|
386
|
return false;
|
|
|
@@ -376,7 +388,7 @@ public class OrderDealService extends Service implements Handler.Callback{
|
376
|
388
|
|
377
|
389
|
@Override
|
378
|
390
|
protected void onPostExecute(Boolean result) {
|
379
|
|
- LogHelper.d("OrderDealService", "上传 UploadTask " + bean + " success ");
|
|
391
|
+ LogHelper.d(TAG, "上传 UploadTask " + bean + " success ");
|
380
|
392
|
orderList.remove(bean);
|
381
|
393
|
dealOrder();
|
382
|
394
|
}
|